Include changes from the 1.2 branch 
1 file changed